fixed merged issues after merge from master