grafted from yonchu/6537c4c: Enhancement