staging: prima: Update from kk_3.5