s3 working
video lib
Merge branch 's3' into develop
video lib