case 2725 - Fetch the correct ting object markup.
Merge branch 'case-2725' into development