llaske Merge branch 'pr/1296' into dev