#694 CustomOptionsProvider changed to service;