Framework code modification
Merge branch 'raysmond'