ARGUS-176: Fix Release related issues