Merge "Fix Sonar issues in ATDB" into develop