compatibility with current builds towards Juno M2.
3 files changed