Merge branch 'release/0.5.0'
BUG-9787 hoya scripts env variables broken in 0.5.0
Merge commit '1c610716cb0d7fd5b3e48b1767c25c8da8121cad' into feature/BUG-9254-secure

* commit '1c610716cb0d7fd5b3e48b1767c25c8da8121cad':
  BUG-9787 hoya scripts env variables broken in 0.5.0