Fixed merge errors regarding framework-pac/framework2 change and some other missing upstream stuff