Feature/storm 5775 squash3

@ledio @declanshanaghy