Added changes from PR #567 to website-develop