Merge "Fixed ChangeBounds matching against the wrong View." into lmp-dev