Feature/storm 5775 squash2