Merged: manually merge of @slavikshen master