Merge branch 'fix_486' into 'develop'