TMDM-7407: init fix with regressions to be corrected