Backtrack

Bert Palmrequested to merge
backtrack into develop

Followup implementation of #143 (closed)

Edited by Bert Palm

Merge request reports