Resolves #BB-659
Fix #BB-432
Fix #BB-454