Fix bug at display content block
Merge branch 'AI2892-display_content_order_attributes' into stable