20160904_to_20161017_fixes
