Pushing in all latest changes for feature modelling