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

- Some formating changes