#CRA-664, #CRA-665
Merge branch 'CRA-664' into CRA-505
Merge pull request #89 from enesvold/CRA-505

Cra 664, Cra 665