List src attr and pb varible names fix
Merge branches 'master' and 'list'