CRA-698: Add two files forgotten in previous commit