Merge branch 'master' into ie_functions