Merged from Seedpeer branch