Fix/maintenance 3.x/2641 bootmessages