Merge branch 'sg/t9300-robustify'