Commit before some significant changes in buf ctx logic