[20160929201712] Bug Fixes