Merge "Change null behavior of getCellBandwidths" into pi-dev