This MR fixes issues introduced in !43749 (merged) and which could not be fix by
!43939 (merged)
tagging @khoo and @jburr