[CDF-414] e [CDF-415]

@pamval please review.