Merge "Remove redundant synchronization blocks from IMMS"