Minor changes
Merge jav_dev into local master in MAC