ORCOMP-30 Replaces default IPleaseWaitService with new one
Merge remote-tracking branch 'origin/develop' into develop