CFY-1215: Address Ran Ziv comments