[MIN] Cleanups
Merge branch 'stable'
[MIN] Cleanups