Merge "Start logging rotation lock history + include caller information" into main