Merge "Fix monitor visit for class initializer" into lmp-dev