Add changes for architectures w/o a stable tree due to the latest council decision