Merged changes of core into console