Revert "ACF-55: HSA funcionality removed"

This reverts commit e8d57d078e7b375410914f4dfa2deca7c49e567f.