Merge commit 'ec97bfbc' into manualmerge