Merge "BUG-865: remove String-based getDataChildByName()"