before merging in the changes v_B61 to v_B72_R37x (incl. Java7 support)