Merge "Sonar fixes in bpgenerator models/blueprints package"