Sync module with d.o (CoF crash, code comment tweaks.)