manual merging good stuff from master