Merge "Correct monitor pool synchronization" into nyc-dev