https://hawaii.atlassian.net/browse/HRW-878