Merge "SPMD: fix boundary check if manifest is page aligned" into integration