merge capabilities changes to develop