Merge branch 'jk/has-uncommitted-changes-fix'