sync with private on 2013-04-18