Merge "Additional layer logging, and added mutex" into lmp-dev