added missing files from previous merge from develop branch