Merge doc changes from cupcake: commit '5ae517d9659e96e9525406ffbce18dcacc3294bc' into manualmerge