trunk version of nomaka-followup component