Merge "Remove features from sensors APEX" into main