Upstream version 5.2.0