Update build system
IMP-334 #resolve fixed
IMP-335 #resolve fixed