Back port Shared App name fix #359