Upstream version 5.2.7