Improved robustness
Merged conflicts