Final merge of db_SOCRFW-79 to db