Merge "Delete unused mask eTransactionMask parameter"