Merge commit 'e0d30d674d59f3f2b04ab07e14f50390f30024a8' * commit 'e0d30d674d59f3f2b04ab07e14f50390f30024a8': Revert the channge where channels were not selected randomly.
Merge commit 'e0d30d674d59f3f2b04ab07e14f50390f30024a8' * commit 'e0d30d674d59f3f2b04ab07e14f50390f30024a8': Revert the channge where channels were not selected randomly.