Then merge into master and apply these two on top: