bringups from caf 4.1.2