Citrus staging to master

Citrus feature review before merging to master.