Merge branch '19376-fix-activation-in-inconsistent-state' into 'stable'