Merge branch 'mkp-fixes' into fixes