Merge "Specify whether or not the disconnected string should be used" into tm-dev