AC 3.2-rc14 (pre) - manual merge