DC/Melanie | #4142 | conditional logging of softdeleted subjects
Merge branch '17_0_release' into develop