Merge "Drop validation resources dependency from CONF"