automerge: e6e216c * commit 'e6e216c48ea25bdbc2d0a262c74670fb6513e42b': Avoid ripple buffer creation for empty bounds