Cherry-pick startup changes and fixes from v3.x.x

[nxhafa]

As part of the effort to improve the StartUp check on v3, there were some issues found and fixed.
We should carry them over to v2 as well.

For reference check PR: #4463, specifically the following comments:
#4463 (comment)
#4463 (comment)
#4463 (comment)