Implemented JC-908
Implemented JC-908
Merge branch 'master' into JC-908