MISC-misc-39a11.10: Misc changes
INT-feat-39a12.0: Major improvements on build interface