Merge "Color effect comments and method name changes."