updated functions
Merge branch 'release/1.13'