Nbia rev 14504

Pull request to implement changes of branch into master branch