Force save variables to -v7.3
Merge remote-tracking branch 'upstream/develop' into develop