Merge duggasys with develop

To make sure the branch does not end up being left behind