second round of CR for controller completed with annotation FIXME-AK: