make compilable after J12 merge
2 files changed