Religious discrimination bill due for 2020