Merge "Address API council feedback" into qt-dev