XX-10960 Added pintoken in all situations