adapt to seams of pass-entry
Merge branch 'pass-entry'