Merged current state of AI branch (10 / 22 / 14) to the Master.