ticket:13 signals change
Merge remote-tracking branch 'remotes/origin/ticket_13'