Merge "Version dependant target should included version in name"