[Squash->2] dropped not patch related stuff