Merge "Squashed commit of the following:" into lmp-preview-dev