Feature 2 common
Only core 4 file
Merge branch 'develop_net4' into core_net4