code review changes
worker complete
Merge pull request #1282 from john-hill/PLFM-2730-b

code review changes
Merge remote-tracking branch 'upstream/develop' into PLFM-2779