Rep 1158 core spring NO MERGING TO MASTER

This is only opened for review ease. It will fail the jenkins builds.