Merge branch 'release/1.5.6' into develop
Force store to be file-based
rp
merge