Merge commit 'bigon/configure-deprecated-flag'