Merged monitor-cleanup branch to trunk