(alternatives-#1) alternative_entry prototype
Merge remote-tracking branch 'origin/issue_1-alternative_entry'