Applied framebuffer changes from commit bf25656aff2aacc97bb18d6d4b2a65fa107438db to release 2.1