Fix indent loading
Merge with origin