Integrated jSAF 1.2 changes.