Issue #1227 add utility dirs to build