Merge "Add comments for [deploy|rescue]_interface"