Merge from stable branches and updates for master