Merge topic branch t/sf_float into pu