Refactor/move around accept#19

shaleh wants to merge 2 commits intotamentis:mastertamentis/rpdb:masterfrom

shaleh:refactor/move-around-acceptshaleh/rpdb:refactor/move-around-acceptCopy head branch name to clipboard