Merge "Follow constant refactoring in framework."