"final" updates (listings, trs comments)
Merge remote-tracking branch 'upstream/master'