Adding R# 8.1 support
Merge branch 'release/8.1'