Merge "Add extra altref option for hierarchical structure"