Merge branch 'pratu16x7-bom-view' into develop