Merge branch '286-extend-device-feature-limit-validation' into 'master'