https://jgore1.atlassian.net/browse/LIB-3