Imported Upstream version 8.2.1