Merge "Spring Aspect logging"