Merge "Move v4 support base dir to donut to match master." into klp-modular-dev