Changes in the scope of list rendering

Making pull request against the master with some additional changes. 
Refs:
#4449
#5545
#5448