Atmire 1763 fixes only