Some Backend Design Fixes migrated from 2.0.13
Some Backend Design Fixes migrated from 2.0.13