RA-197: Fixed build