Code sample is more complex than it needs to be.
To be done after NCBC-2458
This appears to have already been done.
This appears to have already been done.