#CRA-709, #CRA-716
Merge pull request #142 from enesvold/CRA-505

#CRA-709, #CRA-716