Merge
Merge
Minot fixes