otp R16 support

It would be nice to have this work in R16. Are there known issues?