merge of the actual 3.1 into the 3.1.JPMS