Merge "small fix to change double constants to floats bug:22801078"