Merge branch 'rs/maint-retval-fix' into maint