[OptionsResolver] Merged Options and OptionsConfig and restored old OptionsResolver class