Re #1709 Removed variable for Corelib until we find an elegant
non-breaking solution
Re #1709 changes reflecting latest version of corelib
Merge branch 'feat/1709-codecleanup' into develop