Merge doc changes from cupcake at commit '373271b94cbe01c337b4952d0d5764e200c69f48'