New feature: Support for featureA.

Added support for feature A which does nothing.
Fixed merge conflicts.