Merge "Fixes issues from bug bash" into lmp-preview-dev