[development] issue followups as comments -- testing needed