https://zeppelin-project.atlassian.net/browse/ZEPPELIN-19