Merge pull request #2075 from dibdot/force_update