Sync bolt-relay branch as per latest develop branch.