[DF-3256] visibility flag save/load added to fix the issue
Merge branch 'origin/development'