LPS-30514 Change app-server specific code to apply to all app-servers