Add missing get_data_specs method to VariationalPCD cost
Fix merge-related bugs