Updates for RE CLI XML import
Fixes for 575 and 563.