merge framework updates
bugfixes with framework update