Merge remote-tracking branch 'pmaydell/configury.next' into staging