restore functions
Merge branch 'hotfix/restore_functions' into production