Merge pull request #16827 from alalek:update_buffer_area