Verified with support that # 1 is not official yet and they don't have any date when that's going to be done. # 2 is done in 2017.1 release.