merge from qii/0.50