misc: Merged m5ops_base hotfix into develop