Patched code for APNIC ObjectTemplate Test to pass
Merge remote-tracking branch 'origin/upstream-rpslvariant' into upstream-rpslvariant