refactorings after changing escalations from boolean to comments;
Merge remote-tracking branch 'origin/master'