Merge "Allow clearing out the source bounds" into ics-mr0