diff --git a/cmake/cyclonedds/CMakeLists.txt b/cmake/cyclonedds/CMakeLists.txt
index 7fde2d7083..739c4dcb1a 100644
--- a/cmake/cyclonedds/CMakeLists.txt
+++ b/cmake/cyclonedds/CMakeLists.txt
@@ -89,4 +89,4 @@ endfunction()
 
 fetch_and_install(idlpp-cxx)
 fetch_and_install(cyclonedds)
-fetch_and_install(cyclonedds-cxx -DBUILD_TESTING=OFF)    
+fetch_and_install(cyclonedds-cxx -DBUILD_TESTING=OFF)
diff --git a/iceoryx_posh/.clang-tidy b/iceoryx_posh/.clang-tidy
index a8967539b2..726007c908 100644
--- a/iceoryx_posh/.clang-tidy
+++ b/iceoryx_posh/.clang-tidy
@@ -1,14 +1,14 @@
 Checks: '-*, readability-identifier-naming'
 CheckOptions:
-  - { key: readability-identifier-naming.ClassCase,               value: CamelCase } 
-  - { key: readability-identifier-naming.EnumCase,                value: CamelCase } 
-  - { key: readability-identifier-naming.StructCase,              value: CamelCase } 
-  - { key: readability-identifier-naming.UnionCase,               value: CamelCase } 
-  - { key: readability-identifier-naming.MethodCase,              value: camelBack } 
+  - { key: readability-identifier-naming.ClassCase,               value: CamelCase }
+  - { key: readability-identifier-naming.EnumCase,                value: CamelCase }
+  - { key: readability-identifier-naming.StructCase,              value: CamelCase }
+  - { key: readability-identifier-naming.UnionCase,               value: CamelCase }
+  - { key: readability-identifier-naming.MethodCase,              value: camelBack }
   - { key: readability-identifier-naming.NamespaceCase,           value: lower_case }
-  - { key: readability-identifier-naming.MemberPrefix,            value: m_ }        
-  - { key: readability-identifier-naming.MemberCase,              value: camelBack } 
-  - { key: readability-identifier-naming.ConstexprVariableCase,   value: UPPER_CASE } 
-  - { key: readability-identifier-naming.EnumCase,                value: UPPER_CASE } 
-  - { key: readability-identifier-naming.GlobalConstantCase,      value: UPPER_CASE } 
-  - { key: readability-identifier-naming.TemplateParameterCase,   value: CamelCase } 
\ No newline at end of file
+  - { key: readability-identifier-naming.MemberPrefix,            value: m_ }
+  - { key: readability-identifier-naming.MemberCase,              value: camelBack }
+  - { key: readability-identifier-naming.ConstexprVariableCase,   value: UPPER_CASE }
+  - { key: readability-identifier-naming.EnumCase,                value: UPPER_CASE }
+  - { key: readability-identifier-naming.GlobalConstantCase,      value: UPPER_CASE }
+  - { key: readability-identifier-naming.TemplateParameterCase,   value: CamelCase }
\ No newline at end of file
diff --git a/iceoryx_utils/.clang-tidy b/iceoryx_utils/.clang-tidy
index 9df3dbebd0..69638021a8 100644
--- a/iceoryx_utils/.clang-tidy
+++ b/iceoryx_utils/.clang-tidy
@@ -1,14 +1,14 @@
 Checks: '-*, readability-identifier-naming'
 CheckOptions:
-  - { key: readability-identifier-naming.ClassCase,               value: CamelCase }  
-  - { key: readability-identifier-naming.EnumCase,                value: CamelCase }  
-  - { key: readability-identifier-naming.StructCase,              value: CamelCase }  
-  - { key: readability-identifier-naming.FunctionCase,            value: camelBack }  
-  - { key: readability-identifier-naming.MethodCase,              value: camelBack }  
-  - { key: readability-identifier-naming.NamespaceCase,           value: lower_case } 
-  - { key: readability-identifier-naming.MemberPrefix,            value: m_ }         
-  - { key: readability-identifier-naming.MemberCase,              value: camelBack }  
-  - { key: readability-identifier-naming.ConstexprVariableCase,   value: UPPER_CASE } 
-  - { key: readability-identifier-naming.EnumCase,                value: UPPER_CASE } 
-  - { key: readability-identifier-naming.GlobalConstantCase,      value: UPPER_CASE } 
-  - { key: readability-identifier-naming.TemplateParameterCase,   value: CamelCase }  
\ No newline at end of file
+  - { key: readability-identifier-naming.ClassCase,               value: CamelCase }
+  - { key: readability-identifier-naming.EnumCase,                value: CamelCase }
+  - { key: readability-identifier-naming.StructCase,              value: CamelCase }
+  - { key: readability-identifier-naming.FunctionCase,            value: camelBack }
+  - { key: readability-identifier-naming.MethodCase,              value: camelBack }
+  - { key: readability-identifier-naming.NamespaceCase,           value: lower_case }
+  - { key: readability-identifier-naming.MemberPrefix,            value: m_ }
+  - { key: readability-identifier-naming.MemberCase,              value: camelBack }
+  - { key: readability-identifier-naming.ConstexprVariableCase,   value: UPPER_CASE }
+  - { key: readability-identifier-naming.EnumCase,                value: UPPER_CASE }
+  - { key: readability-identifier-naming.GlobalConstantCase,      value: UPPER_CASE }
+  - { key: readability-identifier-naming.TemplateParameterCase,   value: CamelCase }
\ No newline at end of file
diff --git a/tools/gcov/lcov_generate.sh b/tools/gcov/lcov_generate.sh
index 2c210fdf31..06b0f4ae37 100755
--- a/tools/gcov/lcov_generate.sh
+++ b/tools/gcov/lcov_generate.sh
@@ -1,6 +1,6 @@
 #!/bin/bash
 
-# Copyright (c) 2019-2020 by Robert Bosch GmbH. All rights reserved.
+# Copyright (c) 2019-2020, 2020 by Robert Bosch GmbH, Apex AI Inc. All rights reserved.
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -19,21 +19,21 @@ COMMAND=${2:-$capture}
 OUTPUT_FOLDER=$BUILD_FOLDER/build/lcov
 
 mkdir -p $OUTPUT_FOLDER
-#  --initial 
-case "$2" in    
+
+case "$2" in
     "initial")
         lcov -c -i -d $BUILD_FOLDER -o $OUTPUT_FOLDER/iceoryx_init.info --no-external --rc lcov_branch_coverage=1
         ;;
-    "capture")    
+    "capture")
         lcov -c -d $BUILD_FOLDER -o $OUTPUT_FOLDER/iceoryx_test.info --no-external --rc lcov_branch_coverage=1
         ;;
-    "combine") 
+    "combine")
         lcov -a $OUTPUT_FOLDER/iceoryx_init.info --add-tracefile $OUTPUT_FOLDER/iceoryx_test.info -o $OUTPUT_FOLDER/iceoryx_full.info --rc lcov_branch_coverage=1
         ;;
-    "remove") 
+    "remove")
         lcov -o $OUTPUT_FOLDER/iceoryx_filter.info --rc lcov_branch_coverage=1 -r $OUTPUT_FOLDER/iceoryx_full.info "*/build/*" "*/test/*" "*/iceoryx_examples/*" "*/testutils/*" "*/roudi_environment/*"
         ;;
-    "genhtml") 
+    "genhtml")
         genhtml $OUTPUT_FOLDER/iceoryx_filter.info -o $OUTPUT_FOLDER --config-file --legend --show-details --branch-coverage
         ;;
 esac
diff --git a/tools/introspection/CMakeLists.txt b/tools/introspection/CMakeLists.txt
index 8a25617456..ec0086c4b6 100644
--- a/tools/introspection/CMakeLists.txt
+++ b/tools/introspection/CMakeLists.txt
@@ -14,7 +14,7 @@
 #
 
 cmake_minimum_required(VERSION 3.5)
-set(iceoryx_introspection_VERSION 0.16.1)
+file (STRINGS "../../VERSION" iceoryx_introspection_VERSION)
 project(iceoryx_introspection VERSION ${iceoryx_introspection_VERSION})
 
 find_package(iceoryx_posh REQUIRED)