#660 added deleted files from 660 merge. commit 21dc4e92158ae5fb83e637e1a0f9b69f917cdd54