Made changes in J1
Merge branch 'J1' into Test