Merge "Fixed check for visible volume." into nyc-dev