Merge "Add constant instead of duplicating literal"