Keep backwards compatibility with v1.0 in rax-prod branch