Merge "Fix problems with wiring of initializing calls (1/2)" into lmp-dev