make use of release-5.10 branch to get last fixes