Temporarily disabling function cache
Merge remote-tracking branch 'upstream/1.3.0' into 1.3.0