Merge "SF: add buffer checks to Render Engine" into sc-dev