Merge "Fix reference to moved class." into jb-dev