Merge pull request #604 from zefir-k/A1.upstream.merge A1: add support for updated product variants, small fixes