update from tc/codina/11.0

Change-Id: I909aaab16bc6ee5dfed4d387b7c6b8179136e52a