Merge "Clean up rollbacks and test apps" into rvc-dev