Merge "Added checks while unfreezing bounds" into nyc-mr1-dev