Merge "Clean up code of starting bug report" into rvc-dev