Merged from bal2