master
BAEL-7142, modify add exeption handler and service layer
Fix merge conflicts.
BAEL-7142, fix minor comment
backlink removed
[JAVA-37853] Remove unused properties (#17353)