Merge "Added some debugging log messages at stop()"