Merge "Add logs to javelin2"