upstream version 2.5.12