Merge "Additional layer logging" into lmp-dev