resolved conflict to allow merge with 2012.2.3