merge from spf13