latest changes to support f19