Merge "Auto-fill logging improvements:"