Code review changes for PLFM-1757