merge 2013.02 changes