Imported Upstream version 1.12.85