Patch Release 1.16 for PLFM-1670, PLFM-1672