Merge and move -core and -commons services
Fixes following rebase of origin/master changes
Fixes following rebase of origin/master changes