Merge branch 'isar_selection_branch' into isar_bitstream_format_update