#828 Changes for qulice
#828 Changes for qulice