CE-294

@grunny - pinging you to review this per usual protocol