39057552dc
* extract out function + add unit tests * add feature toggle and default it to on
* extract out function + add unit tests * add feature toggle and default it to on