Push changes from beta to live

Imran Hussainrequested to merge
beta into sucs-site

Beta is fine, changes look good.

Merge request reports