adjustments to debug setup
Merge remote-tracking branch 'origin/lyt-3.0' into lyt-3.0