Fix FINDPROPER
Merge branch 'develop'