Merge "Support software styling" into devel/master