Upstream version 6.0-b17