disabled if none, added show popup indicator
Merge remote-tracking branch 'upstream/master'