Make Configurable
require Configuration
#2146
Merged
Configurable
require Configuration
#2146