Allow case insensitive caps for add and drop Upstream-commit: dae6af1d1c6692d983151674fb6778006ef0a87a Component: engine