Merge branch 'ep/commit-static-buf-cleanup'