Added support for r# 7.1