Major update for 4.1 core compatibility.