Merge changes from Lukifer for v1.8.0