https://www.jfrog.com/jira/browse/GAP-158