updating dev with direct master commits