Merge "bootanalyze: Use alternative for timestamp alignment" into main