test merge BUGR-10903

, not fully merged since there are remaining issues on submission