Merge "Add temporary bbq merge path to SCR logs" into main