[WFK2-600] - Add comments

This merge will bring in the latest changes to the upstream and the additional comments that I just made.