Change function reference syntax (flink -> function)
Merge branch 'develop'