Merge float and fixed codebase on boss*