Merge "Remove unnecessary framework allocations" into jb-dev