PLFM-1956: changes from code review with Bruce