Merge "Add logging when "Advanced" button is clicked"