Should be addressed by the Applications 17.04 update, once we land this in (it's large, and requires still a bit more time).