#241 hopefully hides on form error now!
Merge remote-tracking branch 'refs/remotes/origin/BBA-Power-V4.0' into BBA-Power-V4.0