Merge branch 'sg/t5310-empty-input-fix'