Import branch with all the mono fixes including ID for MS Office