Sample 4 bug-fix
Merge branch 'mt-4' into mt-5