Fixed data update from within scripts
rp
Merge branch 'release/1.5.2' into develop