Merge pull request #1941 from deftsp/master

Fix outshine depend.
Fix cycle dependence of outorg and outshine.