Imported Upstream version 14.12