PLFM-1994: code review changes, take II