Attempt for another matching framebuffer logic
Merge pull request #4491 from raven02/patch-15

Attempt for another matching framebuffer logic