#CRA-687, #CRA-692
Merge pull request #105 from enesvold/CRA-505

CRA-682, CRA-687, CRA-692