monitor_set might have been used without being initialized.
otherwise, lint, whitespace, style
Merge branch 'develop' into new-split