can't remember
Merge branch 'marg-10-1'
reactivated lines to dispaly author boxes