Merge "Address API conucil feedback" into qt-dev