reformat, transactional version, services
Merge remote-tracking branch 'origin/master'