Merge branch 'functions-update' into dt-test
Merge branch 'pretty-up' into dt-test