Make plate transfers conditional
Merge branch 'development' into uat