backouts bug: 791924 - rev: 96a1b24e0067
merges backout 96a1b24e0067 -> default