Imported Upstream version 5.2.1