Merge "Add another OptionsBuilder constructor with the source type as one of its parameter." into sc-dev