merge backend changes from master