Fix Hang
Merge origin/prolog1 into prolog1