Add missing features
(cherry picked from commit d4a95786fe08c8f5fc735f1b71407edcd131b2ee)