SDPIII-82 fixed bug for nil class
SDPIII-95 missing template error
SDPIII-95 removing from master branch