Create develop branch, switch back to one that works with latest haf

Eric Friasrequested to merge
update-haf into develop

This reverts commit d30daba5.

Merge request reports