WEB-215 Handling fee is set on handlingfee only
Merge remote-tracking branch 'origin/develop' into develop