[2.30] branch empathy