sync with 237b9c6d
sync with 4f5e76eb
minor fix