Merge pull request #2609 from castillofrancodamian/transmission