Merge branch 'ReturnFix'