Merge branch 'master' into datapoints-exceptions-#449