[master] Global improvements