don't display context menu if empty
Merge remote-tracking branch 'origin/dev' into dev