merge from eppic-team