Porting to addon sdk 1.17 (using jpm).