Created hot fix based on trq-2237