Issue 3744 host delete

also merge in master. the bug could happen in master too