Add missing features
(cherry picked from commit eac7e69dd051d24ab8cda655bf4f08f93404fbcf)