- fixed issue BE-384 (resolve issue: resolution=RESOLVED status=Fixed)

- fixed issue BE-387 (resolve issue: resolution=RESOLVED status=Fixed)