PLAT-3030 - additional validation and logging
Merge branch 'topic/PLAT-3030' into develop