After merge with Master and additional updates