merging from master dec 01