Added quickfix for NESTED_CLASS_NOT_ALLOWED
merge