#5950

Tested upgrading from 2.5.4, saving containers all good