Merge "Restore WebApps" into casablanca