Fresh copy from local qca to develop multi decoration
