bug fix merges from 2.0