pull v1.05 changes from work branch