Changes for AS 0.8.4