#680 - start of supported features flags - adjustments to initial approach