Alix6b

merging back alix6b