merged PL's master fixes
merged PL's master fixes

kidaa/eol,DanielZhangQingLong/eol4,kidaa/eol,kidaa/eol,DanielZhangQingLong/eol4,kidaa/eol,DanielZhangQingLong/eol4,DanielZhangQingLong/eol4,DanielZhangQingLong/eol4