Add untracked libs
Room Monitor Bug fix
Merge remote-tracking branch 'origin/develop' into develop