add auto / editor block
Merge branch '0626-2'