Merge "Fix property unavailable check logic." into main