Merge branch 'elfiesmelfie-master-patch-80836' into 'master'