#CRA-682
Merge branch 'CRA-682' into CRA-505
Merge pull request #106 from enesvold/CRA-505

CRA-682