Merge pull request #507 from est77/est_OSL_trace

OSL trace call
Fixed PR comments
Merge remote-tracking branch 'upstream/master' into est_OSL_trace