Merge branch 'hotfix/monkey_patch' into master-3