fix utils merge issue
fix issues with merge from develop