backport from ma (activities + account.owner)