This commit is only base for future implementation Change-Id: I3cfb3508de04d0a717245a75b5b197fda68fd01c