[master]: BD-1 test this commit
Testing merge of hotfix into Dev and Master
HOtfix 0.2