Merge "Make logger final"