backouts bug: 1050109 - rev: 38180b78f70c
merges backout 38180b78f70c -> default