Do not create otp dir
Merge branch 'link-problem'