Merge "Fixed calls to update() when configuration changed." into nyc-dev