Merge branch 'fix-63' into dev