major development in develop branch

Change-Id: Ib1e0b6fff6e1ec9ca4f5de3b3928fddf385c446c
Signed-off-by: aaswan <aaswan@aaswan-PC>