Commiting into JA_DEV branch
Merge branch 'JA_DEV' into JA_TS