This MR fixes issues reported here: ATR-28208 (I believe there was another ticket as well). Tagging @kciesla @asmaga @stapiaar