CN-5548 initial commit