Merge "editWarning: Declare dependency on user.options"