Moved to 1.36 snapshot of embed process; fixed failing TC

Contains several white space removals too (trailing only).