ER4 tagged release including Kipp's reverted commits.