GI-1301 Fixed release/adhoc compilation