BC-1923 #resolve ContentRequestMapper fix