* Adding more logs * post merge fix * fixup merge error * review --------- Co-authored-by: Timo K <toger5@hotmail.de>