Revert "merging from master all but peer5"

This reverts commit 9688aaf17551ff95b68d263f7795df004095b667.