Merge branch 'hotfix/monkey_patch' into 'master'

backup monkey patch

See merge request !1