Bug fixes
Merge branch 'fcall-opt' into QA-coverage-1.3.0