avoid strange circular import problem
Merge remote-tracking branch 'origin/master' into plip-13770-portal-tools-removal