With the National Water Commission disbanded in 2014, the Productivity Commission has been tasked to:
The issues paper can be found here
Submissions are open and can be provided now and after the draft report due in September 2017.
Importantly is the on-going nature of inquires and the 2018 inquiry will be the one to keep an eye out for. I have just revised a paper on this issue and I plan to get a lot of my DECRA work ready for that inquiry.