Merge branch 'master' into agresch_storm_3557