Merging changes made into the wrong branch (ARC_hotfixes) into the correct branch (SDK_rewrite_blocks)