Fixed DB creation error when saving the app config and clean import stms
Merge remote-tracking branch 'origin/master'