Merge branch 'STORM-2009'