Merged functional library
Fixed issue related to #1734
Merge branch 'master' into workshop