Merge branch 'fix/remote-follow-errormessage' into 'develop'