FELIX-5274: Uncommitted the patch, which seems to break amdatu-remote integration tests. will investigate soon ...