#1084 change RO behaviour on conditional choices