Added missing changes from common repos

Changes at project night