Merge "Add support for Branch Target Identification" into integration