[Bug Fixed] calling wrong function when only 2 args.
Merge branch 'release/v1.15'