DF-4245 - Review comments