Merge request

Enhanced command spotlight