merge with changes to 2.0 branch, since it will help with a timely completion.