Merge "[RICPLT-2585] Init fixes | Init UTs.........." into PI3