merging changes from review 1915