Merged latest from AliSoftware