Merge pull request from easylogic/develop support timing function as path