Updated to support IDEA 138 branch
Merge branch '138' into dev