Added comments after first round of CR with ANNOTATION=FIXME-AV: