PLFM-1648: Code review changes