INT-2421 Polishing - PR Comments

Also auto-create adapter channel if necessary.