[KFSQA-681] changes to 'auto_populate' based on code review.