incorporated bugfix from VCCW 2.18.0
incorporated bugfix from VCCW 2.18.0

yeswework/fabrica,fabrica-wp/fabrica-dev-kit,fabrica-wp/fabrica-dev-kit,yeswework/fabrica,yeswework/fabrica,yeswework/fabrica,fabrica-wp/fabrica-dev-kit,fabrica-wp/fabrica-dev-kit,fabrica-wp/fabrica-dev-kit