TSP-4468 synced latest changes from acceptance environment