BS-11009, use objects as REST returned types instead of Long directly