FALCON-302 Issues with distributed package properties. Contributed by Shwetha GS