be consistent towards 2.1 (as of M3)
2 files changed