Syncing develop and master for today's publication of marketplace beta version