CMB-825: updated with review comments