Merge remote-tracking branch 'origin/feature/PRXS-951-2109-TagsFix' into feature/PRXS-951-2109-TagsFix