Imported Upstream version 5.5.20