add a compiler warning fix backport; prepare targetted fixes upload