Merge commit '8279c754d176d5c2aa23f6f7ad16fcea03278788' * commit '8279c754d176d5c2aa23f6f7ad16fcea03278788': Making sure that the prefix is handled properly.