Frameworks: Merge in Lots of Improvements from Vanir