TYNSTEP-1005
TYNSTEP-799
TYNSTEP-799 Temporary implementing until we work out exactly what we want to do.