Merge pull request #524 from eric-wu/develop

Partial change for PLFM-1977