Merge branch 'master' into network_handler