Changes made on this branch were taken over to 'F15528_design_for_no_record', this merge request can be closed.
closed