Merge pull request #91 from nmaas-platform/1.5.3-develop