KRACOEUS-6955 : common budget core mainly and other miscs