Merge "Code sinking bug fix." into pi-dev