Merge "Remove hardcoded literals"