Merge "Code sinking bug fix."