Merge "Fixing compatibility with 2017.7"