Merge branch 'master' into task-functions-properties