Stashing changes pre media element branch
Fixed merge conflicts