two additional features can not be exposed just yet in case we do another hotfix