automerge: ff526fa * commit 'ff526fa7106fd45bfc4f1606fe051000c5201920': Fix build breakage in older branches by avoiding <> notation
automerge: ff526fa * commit 'ff526fa7106fd45bfc4f1606fe051000c5201920': Fix build breakage in older branches by avoiding <> notation