updating tmp file
Merge branch 'refs/heads/master' into status_controller