Fixes #8035: Commit container changes

This is lacking tests for the moment, will update it with tests soon.