Revert "Merge branch 'test_update' into 'django'"

This reverts merge request !157 (merged)
The MR may break the production branch. It has to be re-submitted in a correct way.