local changes up to 170413