Stable
Merge branch 'master' into queue_inspection

Quick fix, forgot an include