fix #7358 added all requested features