Merge "Update JMX generator"