Merge "Application start up issue is fixed"