Merged with latest master + fixed conflicts