[DF-3293] Changes after review. Not final.