#CRA-682
Merge branch 'CRA-682' into CRA-505