Fx 377 back merge 1

Please check that version is 1.4.0. Is that correct?