BZ-9695 fixes for create faciity
Merge remote-tracking branch 'refs/remotes/origin/master'
BZ-9695 fixes for create faciity