updated: aligned to upstream version in git.