[Change Log] 30-10-2017