Assist with #583 - Startup excessive logging and start up time

(cherry picked from commit b99fc59056e0055c36890d52130d4070f2ca23ed)