Merge "Respect the rollback data policy (3/n)"