Testing prepare merge to master

Yaron, Gena, this branch is merge between round_clock_testing and current master.
Please check the merge is ok (only file problematic was content_data.rb).
Other were merged automatically.
After you test/fix, please merge it to master.