Merge branch develop-6.7 into branch develop-7.0
[[ Merge-6.7.1-rc-4 ]] Fix for few mismerged lines
[[ LC 7.0.1-rc-4 ]] Update IDE submodule
[[ LC 7.0.1-rc-4 ]] Bump version number