Feature/options manager #5055