Merge branch 'sg/t3903-missing-fix'