Merge branch 'release-53401' into test

# Conflicts:
#	src/main/java/com/fdkankan/modeling/receiver/RabbitMqListener.java