BUN-909: [pending for cherub/wishiestar]

Owned by kingfauna