merge of the current 4.0 into the 4.0.JPMS