magic priv support
Merge branch 'develop', remote branch 'upstream/develop' into develop
heart support