Merge "Support for XApp configuration update (new retry)"