Rebased bok-choy version update onto current master

@raeeschachar - I squashed and rebased your and ammar's changes onto current master.