block: updates from CAF msm-3.0