Missing edit context and use option
(cherry picked from commit fa73f22)