Merge branch 'jk/maint-1.7.2-status-ignored'