fix some rollout related bugs
Merge branch 'rollout_bug_fixes' into dev