Remove couple of FIXME-s
Merge branch 'master' into builds
7.657