5.2 merge

Has DB changes so run dbexport when merging.