merge PR of @yegord