Fixed PR comments
Merge remote-tracking branch 'upstream/master' into est_OSL_trace
Merge pull request #508 from est77/est_OSL_trace

fixed OSL trace PR comments