Changes in YAP-5.1

Yap-5.1.0: