[#1659] make submit_and_follow a simple function