#JC-1584:
* Implemented
Merge remote-tracking branch 'origin/JC-1584'