The implementation of JVET-AI0194 on top of JVET-AI0195 which was submitted as merge request !19 (closed)