4.2 core related release. Minor bugfixes & improvements to match new core structure.