Fixes T10000053
Merge branch 'feature'