TRUNK-3644 Fixed build short and numeric only version