Updated for R# 8.1.
Merged in latest from master.