synchronization with beta branch
formatting
XMLSerializer: exception management simplified
members reordering