Merge "Code sinking near "always throwing" method calls"