commiting to JA_DEV
Merge branch 'JA_DEV' into JA_TS