well, I never did all those changes but am still trying to fix the changelog entries ... another try with rq 1121479