fix image tag
Merge branch 'master' into feature/pure_client