Merged master into navigator_rewrite
Merged master into navigator_rewrite_estimator