Try switching version dependency to 3.1.1 instead of 3.1.1-beta1
Merge branch 'cg+sql' into encrypt2