factor some shared code out to am, EDUID-155
increase versions for changes related to EDUID-155