FEC-964 - further fix
Merge remote-tracking branch 'origin/master'