Fixes #83 clean code and reactivate the quote after canceling on HPP
Merge remote-tracking branch 'origin/develop-2.1.1' into develop-2.1.1