CRA-550: Closing the final cases
Merge pull request #152 from RagnarHauge/CRA-505

 CRA-550: Closing the final cases