closing feature #5520 5 bugs fixes