Fix for PLFM-2338, PLFM-2339.