Merge + Alexey changes + Content Data changes + Small issues changes.