Revert "Debug Update 3"

This reverts commit cde3e9f4524241cefd7760928618e0e94e335fbd.
Revert "Revert "Debug Update 3""

This reverts commit c44ab74bee3f2c60294ac58bfa0bea32fd5c81ca.
Merge remote-tracking branch 'origin/master'