Merge "Re-enable atlas" into lmp-preview-dev