Merge "[RONs] Fix over-restrictive requirement in promotion logic." into main