Merge remote-tracking branch 'morlix/check_mk' into next