Merge branch 'dottenbr-manufacturer_childtable' into develop