Merge imp@'s changes.