Temp fix for PLFM-1835. Do not merge back into develop branch.