Merged changes of core, fixed achievements presentation