Merge XYX4AS back master (first release)