group done. refactor context extend. fix explicit bug for 5.4