BZ-11296 updated paths