Static - added columns
Static - content layout
Merge remote-tracking branch 'origin/develop' into develop