http://jira.greenmile.com/browse/GM-6369