sync with dev7-www (development)