VE-635: Resign from using messages for source trigger key