Merge from stable (Valcor's fixes)