Merged Current Dev with Staging plus fixes #842

Closed pauleke65 closed 3 years ago