[#78567544] Conform to apiary response pattern