Jira Issues: BSD-49, BSD-57, BSD-19, BSD-58, BSD-52