Merge "Refresh state after loading conditions from xml." into nyc-mr1-dev