#18 In Progress - Updated avmplus-master patches