Ensure R15 backward compat