Move forensic-haven code from master to production