Merge branch '946-complexity-missing-pop_wmops-in-vbap_init_data' into 'main'

Resolve "[complexity] missing pop_wmops() in vbap_init_data()"

Closes #946

See merge request !706