Merge PA Barracuda frameworks:base and Settings