Import ldevesine's changes.