Even more fixes in the sunriseset procotol
Fixed some compilation warnings
Merge remote-tracking branch 'upstream/development' into development