Atmire 1763 fixes only 2 - rebase against current master