Issue #3103010 by AndrewsizZ, No Sssweat, jungle, Lendude, jshimota01: Machine Name needs further clarification (cherry picked from commit 0e336272)