Merge branch 'STORM-2010'