Merged changes from mai trunk up to 2.3.1