A.158. Release 3.6.4

Release Date: 2017-05-11

A.158.1. Bug fixes