Fresh changes from ronnix master