code simplification
synchronization with beta branch
Merge branch 'master' into beta
open previous file (not help) if possible