6.1.1 with fixes for overflow and media loading