resolving issues after merge from dev