https://github.com/WordPress-Phoenix/wordpress-options-builder-class/pull/30/files needs applied to V5 branch.