[#47974017] Trim the Activity category field on save
[#47814373] NullPointerException rendering chart
[#48080813] Sitehistory not synced offline
Merge branch 'staging' into production