PLFM-1933, applied to release-w