#ta-8 changed the display on the conditions of entry
Merge remote-tracking branch 'origin/master'