[City-heart-merged]