There is a transition rule for the demographic information. Basically, you collect based on the law as it is at the time of application. So if you take the application in 2017, you'll follow current collection guidelines.
_________________________
All opinions are my own, not my employer's