bugfix and extension for reResolve
Merge commit 'a29e31671d1e16944fde8e6c78ea9fcaa97a0863' into develop