WHISTLE-1510: refactor channel_move