fixed issue with handling in only being reported as external effect.
Merge remote-tracking branch 'origin/develop' into develop