0a08072d https://privategrity.atlassian.net/browse/FE-663 a5d4b680 https://privategrity.atlassian.net/browse/FE-662