automerge: 2aacb86 * commit '2aacb861f4c7b80c5d2bb22956c9a5d4ace4df67': Avoid ripple buffer creation for empty bounds