feature/1401-localstorage
core 7.29
Merge branch 'feature/1401-localstorage' into develop