SVN from #2647 fully applied