Project: springxd
Issue XD-1661: Fix package tangles
Sonar build is currently failing.
Story points: 2