Merge "Remove mutator and use standard variant functions"