Merge "Fix issue with DEBUG_OUT_DIR not properly selected"