RC and fixes for feature A.