Comps-sync and other minor changes.
rebased onto c6e3b0f21fcc01fdaca15c229f0bd9521308da87
Pull-Request has been merged by siosm
Comps-sync and other minor changes.