Merge "Improve "isActiveArchive" check by moving it a bit earlier into the method." into main