Merge "New compile-time flags to make debugging easier for us poor souls Bug #7195815" into jb-mr1-dev