4527acb0c3
Merge commit '856dd8a60a70a5b7dca2bf2114872ce063e2ad60' * commit '856dd8a60a70a5b7dca2bf2114872ce063e2ad60': Helper API cleanup. Allows multiple helpers to function,