Merge "Add new content handling methods and implementation" into main