merge pullrequest sbmueller, rcs testcase