Merge branch 'compact_builder' into rebar_builder