[Change Log] 6-11-2017