#00 MERGE from sunrise 120314 branch (10488)
 #00 revert changes due to internal errors from unapplied effects (2002 asp 13 sch. 1) (10492)