Fixes #5243 - Store the content view next version