Update changes from synchronization of dev with redh.thinkcloudgroup