This allows for the database container to stop its execution properly.
merged
mentioned in commit 9899c6b6