Merge remote-tracking branch 'origin/devel' into 563991-improve-checker-manager