Fix GH333
Update changes
Fix merge
Merge branch 'fix/gh333' into devel