checkin more changes from production branch