Merged changes from latest Numix