Merge branch 'elrond-sql-convert_video_data'