port MR 1223 from float to fix bug in JBM which causes problems with some CI tests - BASOP part See merge request !1715
