Merge "Fixing A1 healthcheck"