Fixed internal monitor registration bug
Merge branch 'master' into master_2