Issue #856 was fixed for plocal storage.
Merge remote-tracking branch 'origin/develop' into develop