I've commited the four commits to core-updates. @tumashu: cagebreak 2.1.0 fails in the build or check phase. So I left it out for now...