Merge branch 'v2.1' into v2.1-wraparound
Other fix in manual
Merge branch 'v2.1-wraparound'