#OXTEND-10 in progress (test hook)