Implements more graceful mechanism for managing custom configs. Thanks @thejmather!
Merge commit.