Merge "Added const specifier to remove warning" into experimental