Merge "Update subscriptions_changed_listener_thread as bugfix flag" into main