added 'defaultLayout' for storage default layout (using in other code)
Merge remote-tracking branch 'origin/master'
added 'defaultLayout' for storage default layout (using in other code)