Framework related changes
Emergency on master page