Merge "Refactor few LOG messages management"