Merge "Choose options format using property" into rvc-dev