Make tokens and morpho behaviour more compatible

Change-Id: I374fba14b56258de65948202f3987feab971c9eb
1 file changed