Merge branch 'feature/user-scripts/BK-2020-03' into develop