Upstream version 5.4