Merge branch 'feat/upd-47' into feat/contract-manager-resubmit · neutron-org/neutron-integration-tests@a14ff2c