Update functions file from DevStack
Merge branch 'save-config' into dt-test
Merge branch 'functions-update' into dt-test