when that's accepted I cherry-pick into the rpm/3.6 and rpm/3.7 branches and redo everytrhing for deb?