add upstream changes (v5.2.1-1)