merge passion-common into passion