made abstract /AbstractType and fixed dup messed up field iPR: Obtained from: Submitted by: Reviewed by: