Miniral Changes

Miniral Changes
Merge branch 'zz_local'