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

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