merge from qii/0.49