Merge "Add front buffer usage"