code simplification
synchronization with beta branch
Merge branch 'master' into nook
synchronization with beta branch
Merge branch 'master' into nook