Re #10123. Temporarily revert changes that break tests.
Merge branch 'bugfix/10123_save_float_column' into develop