initial import upstream/devel 65d96eb3d81b677be7cc6d2eb07cca370422e8c6