[CC-695] Add code to handle custom.xml 3