WA for circular deps. Also fixes ALV-749.
Merge remote-tracking branch 'origin/master'