* Companion pr for Substrate #5741 * update to substrate master Co-authored-by: André Silva <andre.beat@gmail.com>