partial merge of changes required for 3.0 front end implementation
second partial merge of changes required for 3.0 front end implementation